Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 2 Aug 2010 22:48:42 +0000 (22:48 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 2 Aug 2010 22:48:42 +0000 (22:48 +0000)
commit2253dad22a4ef0a582eb30e414b4bbd377e87a2e
tree467ec2d4d12ed53402f9a5a77e82fda6590b3ccf
parent713c0e6bef7968bb9c5833f6e4097f81ec1be76d
parent89c9613ccd255d54e24fa1ddf8bc30e2a670ef11
Merge from mainline.